b69678e86e7722d5dbe7ba4bbb3bd7c212eb93e6,springmvc-raml-parser/src/main/java/com/phoenixnap/oss/ramlapisync/generation/rules/basic/RestClientMethodBodyRule.java,RestClientMethodBodyRule,apply,#ApiMappingMetadata#JMethod#,79

Before Change


        
        if (!CollectionUtils.isEmpty(endpointMetadata.getRequestParameters())) {
        	JClass builderClass = new JCodeModel().ref(UriComponentsBuilder.class);
        	JExpression builderInit = builderClass.staticInvoke("fromHttpUrl").arg(baseUrl + endpointMetadata.getUrl());
            JVar builder = generatableType.body().decl(builderClass, "builder", builderInit);
            List<JVar> params = generatableType.params();
            Map<String, JVar> paramMap = new LinkedHashMap<>();

After Change


        init.arg(httpHeaders);
        
        //Build the URL variable        
        JClass urlClass = new JCodeModel().ref(String.class);
        String urlString = baseUrl + endpointMetadata.getUrl();
        JVar url = generatableType.body().decl(urlClass, "url", JExpr.lit(urlString));
        JVar uriBuilder = null;
        //If we have any Query Parameters, we will use the URIBuilder to encode them in the URL
        if (!CollectionUtils.isEmpty(endpointMetadata.getRequestParameters())) {
        	//Initialise the UriComponentsBuilder
        	JClass builderClass = new JCodeModel().ref(UriComponentsBuilder.class);
        	JExpression builderInit = builderClass.staticInvoke("fromHttpUrl").arg(url);
        	//Get the parameters from the model and put them in a map for easy lookup
            List<JVar> params = generatableType.params();
            Map<String, JVar> paramMap = new LinkedHashMap<>();